Revert "Partially outline code inside the panic! macro". #145304

m-ou-se · 2025-08-12T10:55:38Z

This reverts #115670

Without any tests/benchmarks that show some improvement, it's hard to know whether the change had any positive effect. (And if it did, whether that effect is still achieved today.)

Without any tests/benchmarks that show some improvement, it's hard to know whether the change had any positive effect at all. (And if it did, whether that effect is still achieved today.)

rustbot · 2025-08-12T10:55:42Z

Some changes occurred to constck

cc @fee1-dead

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Some changes occurred to the CTFE machinery

cc @RalfJung, @oli-obk, @lcnr

m-ou-se · 2025-08-12T10:55:48Z

@bors try @rust-timer queue

Revert "Partially outline code inside the panic! macro".

rust-bors · 2025-08-12T13:11:40Z

☀️ Try build successful (CI)
Build commit: 77443d8 (77443d892dba8a7b2e4cd4eb0cc6b9e88f80fe30, parent: a1531335fe2807715fff569904d99602022643a7)

rust-timer · 2025-08-12T15:25:58Z

Finished benchmarking commit (77443d8): comparison URL.

Overall result: ✅ improvements - no action needed

Benchmarking this pull request means it may be perf-sensitive – we'll automatically label it not fit for rolling up. You can override this, but we strongly advise not to, due to possible changes in compiler perf.

@bors rollup=never
@rustbot label: -S-waiting-on-perf -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.5%	[-0.5%, -0.5%]	3
Improvements ✅ (secondary)	-0.1%	[-0.1%, -0.1%]	3
All ❌✅ (primary)	-0.5%	[-0.5%, -0.5%]	3

Max RSS (memory usage)

Results (primary 3.9%, secondary -3.8%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

	mean	range	count
Regressions ❌ (primary)	3.9%	[3.5%, 4.4%]	2
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.8%	[-3.8%, -3.8%]	1
All ❌✅ (primary)	3.9%	[3.5%, 4.4%]	2

Cycles

Results (primary -2.5%, secondary -3.3%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-2.5%	[-2.5%, -2.4%]	2
Improvements ✅ (secondary)	-3.3%	[-3.3%, -3.3%]	1
All ❌✅ (primary)	-2.5%	[-2.5%, -2.4%]	2

Binary size

Results (primary -0.0%, secondary -0.0%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

	mean	range	count
Regressions ❌ (primary)	0.1%	[0.1%, 0.1%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.1%	[-0.1%, -0.0%]	18
Improvements ✅ (secondary)	-0.0%	[-0.1%, -0.0%]	3
All ❌✅ (primary)	-0.0%	[-0.1%, 0.1%]	19

Bootstrap: 465.439s -> 465.691s (0.05%)
Artifact size: 377.34 MiB -> 377.37 MiB (0.01%)

oli-obk · 2025-08-12T18:47:37Z

@bors r+

Yay perf improvements. Mostly due to fewer query calls and thus less dep graph edges

bors · 2025-08-12T18:47:39Z

📌 Commit 08acba3 has been approved by oli-obk

It is now in the queue for this repository.

Zoxc · 2025-08-13T12:32:00Z

Keep in mind that it likely regresses code quality.

bors · 2025-08-16T10:15:49Z

⌛ Testing commit 08acba3 with merge 2e2642e...

bors · 2025-08-16T13:24:00Z

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing 2e2642e to master...

github-actions · 2025-08-16T13:26:37Z

What is this?

This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 1ae7c49 (parent) -> 2e2642e (this PR)

Test differences

Show 4 test diffs

4 doctest diffs were found. These are ignored, as they are noisy.

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 2e2642e641a941f0a1400c7827fd89aa86fef8f4 --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

aarch64-apple: 8799.4s -> 5458.1s (-38.0%)
dist-x86_64-apple: 13402.8s -> 10618.1s (-20.8%)
x86_64-apple-2: 7057.3s -> 5642.5s (-20.0%)
dist-apple-various: 4840.3s -> 5607.9s (15.9%)
x86_64-apple-1: 7783.1s -> 6721.2s (-13.6%)
dist-aarch64-apple: 6461.6s -> 5699.1s (-11.8%)
dist-aarch64-linux: 6058.8s -> 5589.8s (-7.7%)
dist-i586-gnu-i586-i686-musl: 5918.8s -> 5504.9s (-7.0%)
dist-ohos-aarch64: 4368.7s -> 4130.6s (-5.4%)
dist-x86_64-musl: 7846.8s -> 7419.5s (-5.4%)

How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

rust-timer · 2025-08-16T15:05:12Z

Finished benchmarking commit (2e2642e): comparison URL.

Overall result: ❌✅ regressions and improvements - please read the text below

Our benchmarks found a performance regression caused by this PR.
This might be an actual regression, but it can also be just noise.

Next Steps:

If the regression was expected or you think it can be justified,
please write a comment with sufficient written justification, and add
@rustbot label: +perf-regression-triaged to it, to mark the regression as triaged.
If you think that you know of a way to resolve the regression, try to create
a new PR with a fix for the regression.
If you do not understand the regression or you think that it is just noise,
you can ask the @rust-lang/wg-compiler-performance working group for help (members of this group
were already notified of this PR).

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	0.6%	[0.1%, 1.0%]	2
Improvements ✅ (primary)	-0.7%	[-1.1%, -0.5%]	4
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.7%	[-1.1%, -0.5%]	4

Max RSS (memory usage)

Results (primary -1.8%, secondary -0.6%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

	mean	range	count
Regressions ❌ (primary)	2.5%	[2.5%, 2.5%]	1
Regressions ❌ (secondary)	4.1%	[4.1%, 4.1%]	1
Improvements ✅ (primary)	-3.3%	[-5.6%, -2.0%]	3
Improvements ✅ (secondary)	-2.1%	[-3.1%, -1.4%]	3
All ❌✅ (primary)	-1.8%	[-5.6%, 2.5%]	4

Cycles

Results (secondary 0.1%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	2.7%	[2.5%, 2.9%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-5.1%	[-5.1%, -5.1%]	1
All ❌✅ (primary)	-	-	0

Binary size

Results (primary -0.0%, secondary -0.1%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

	mean	range	count
Regressions ❌ (primary)	0.0%	[0.0%, 0.0%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.0%	[-0.1%, -0.0%]	15
Improvements ✅ (secondary)	-0.1%	[-0.1%, -0.1%]	2
All ❌✅ (primary)	-0.0%	[-0.1%, 0.0%]	16

Bootstrap: 469.963s -> 470.222s (0.06%)
Artifact size: 377.54 MiB -> 377.51 MiB (-0.01%)

Relevant upstream PR: - rust-lang/rust#145304 (Revert "Partially outline code inside the panic! macro".) Resolves: model-checking#4301

Relevant upstream PR: - rust-lang/rust#145304 (Revert "Partially outline code inside the panic! macro".) Resolves: #4301 By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses.

Revert "Partially outline code inside the panic! macro". This reverts rust-lang#115670 Without any tests/benchmarks that show some improvement, it's hard to know whether the change had any positive effect. (And if it did, whether that effect is still achieved today.)

Mark-Simulacrum · 2025-08-19T02:35:48Z

Changes look like bimodality, not something we need to follow up on.

Revert "Partially outline code inside the panic! macro". This reverts rust-lang#115670 Without any tests/benchmarks that show some improvement, it's hard to know whether the change had any positive effect. (And if it did, whether that effect is still achieved today.)

Revert "Partially outline code inside the panic! macro".

08acba3

Without any tests/benchmarks that show some improvement, it's hard to know whether the change had any positive effect at all. (And if it did, whether that effect is still achieved today.)

m-ou-se assigned oli-obk Aug 12, 2025

This comment has been minimized.

Sign in to view

rust-bors bot added a commit that referenced this pull request Aug 12, 2025

Auto merge of #145304 - m-ou-se:simplify-panic, r=<try>

77443d8

Revert "Partially outline code inside the panic! macro".

This comment has been minimized.

Sign in to view

rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Aug 12, 2025

This comment has been minimized.

Sign in to view

rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Aug 12, 2025

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 12, 2025

bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 16, 2025

bors merged commit 2e2642e into rust-lang:master Aug 16, 2025
12 checks passed

rustbot added this to the 1.91.0 milestone Aug 16, 2025

rustbot added the perf-regression Performance regression. label Aug 16, 2025

tautschnig added a commit to tautschnig/kani that referenced this pull request Aug 18, 2025

Upgrade Rust toolchain to 2025-08-18

a31b677

Relevant upstream PR: - rust-lang/rust#145304 (Revert "Partially outline code inside the panic! macro".) Resolves: model-checking#4301

tautschnig mentioned this pull request Aug 18, 2025

Upgrade Rust toolchain to 2025-08-18 model-checking/kani#4304

Merged

Mark-Simulacrum removed the perf-regression Performance regression. label Aug 19, 2025

m-ou-se deleted the simplify-panic branch August 25, 2025 11:09

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Revert "Partially outline code inside the panic! macro". #145304

Revert "Partially outline code inside the panic! macro". #145304

Uh oh!

m-ou-se commented Aug 12, 2025

Uh oh!

rustbot commented Aug 12, 2025

Uh oh!

m-ou-se commented Aug 12, 2025

Uh oh!

This comment has been minimized.

This comment has been minimized.

rust-bors bot commented Aug 12, 2025

Uh oh!

This comment has been minimized.

rust-timer commented Aug 12, 2025

Uh oh!

oli-obk commented Aug 12, 2025

Uh oh!

bors commented Aug 12, 2025

Uh oh!

Zoxc commented Aug 13, 2025

Uh oh!

bors commented Aug 16, 2025

Uh oh!

bors commented Aug 16, 2025

Uh oh!

Uh oh!

github-actions bot commented Aug 16, 2025

Uh oh!

rust-timer commented Aug 16, 2025

Uh oh!

Mark-Simulacrum commented Aug 19, 2025

Uh oh!

Uh oh!

Revert "Partially outline code inside the panic! macro". #145304

Revert "Partially outline code inside the panic! macro". #145304

Uh oh!

Conversation

m-ou-se commented Aug 12, 2025

Uh oh!

rustbot commented Aug 12, 2025

Uh oh!

m-ou-se commented Aug 12, 2025

Uh oh!

This comment has been minimized.

This comment has been minimized.

rust-bors bot commented Aug 12, 2025

Uh oh!

This comment has been minimized.

rust-timer commented Aug 12, 2025

Overall result: ✅ improvements - no action needed

Uh oh!

oli-obk commented Aug 12, 2025

Uh oh!

bors commented Aug 12, 2025

Uh oh!

Zoxc commented Aug 13, 2025

Uh oh!

bors commented Aug 16, 2025

Uh oh!

bors commented Aug 16, 2025

Uh oh!

Uh oh!

github-actions bot commented Aug 16, 2025

Test differences

Job duration changes

Uh oh!

rust-timer commented Aug 16, 2025

Overall result: ❌✅ regressions and improvements - please read the text below

Uh oh!

Mark-Simulacrum commented Aug 19, 2025

Uh oh!

Uh oh!